wow, that implementation was pretty non-working.

2000-12-18  Havoc Pennington  <hp@redhat.com>

	* gdk/gdkevents.c (gdk_event_get_state): wow, that implementation
	was pretty non-working.

	* gtk/testtext.c (fill_file_buffer): make this a bit more robust
	by passing the length to g_utf8_validate().

diff --git a/ChangeLog b/ChangeLog
index bf4830e10ce0a76e3fc24e8355b7c470cde7904f..8ffb50429c939cd5f79db5931392f3c44f609355 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-12-18  Havoc Pennington  <hp@redhat.com>
+
+       * gdk/gdkevents.c (gdk_event_get_state): wow, that implementation
+       was pretty non-working.
+
+       * gtk/testtext.c (fill_file_buffer): make this a bit more robust
+       by passing the length to g_utf8_validate().
+
 2000-12-16  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gdk-pixbuf-loader.h, gtk/gdk-pixbuf-loader.c: 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index bf4830e10ce0a76e3fc24e8355b7c470cde7904f..8ffb50429c939cd5f79db5931392f3c44f609355 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+2000-12-18  Havoc Pennington  <hp@redhat.com>
+
+       * gdk/gdkevents.c (gdk_event_get_state): wow, that implementation
+       was pretty non-working.
+
+       * gtk/testtext.c (fill_file_buffer): make this a bit more robust
+       by passing the length to g_utf8_validate().
+
 2000-12-16  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gdk-pixbuf-loader.h, gtk/gdk-pixbuf-loader.c: 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index bf4830e10ce0a76e3fc24e8355b7c470cde7904f..8ffb50429c939cd5f79db5931392f3c44f609355 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2000-12-18  Havoc Pennington  <hp@redhat.com>
+
+       * gdk/gdkevents.c (gdk_event_get_state): wow, that implementation
+       was pretty non-working.
+
+       * gtk/testtext.c (fill_file_buffer): make this a bit more robust
+       by passing the length to g_utf8_validate().
+
 2000-12-16  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gdk-pixbuf-loader.h, gtk/gdk-pixbuf-loader.c: 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index bf4830e10ce0a76e3fc24e8355b7c470cde7904f..8ffb50429c939cd5f79db5931392f3c44f609355 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+2000-12-18  Havoc Pennington  <hp@redhat.com>
+
+       * gdk/gdkevents.c (gdk_event_get_state): wow, that implementation
+       was pretty non-working.
+
+       * gtk/testtext.c (fill_file_buffer): make this a bit more robust
+       by passing the length to g_utf8_validate().
+
 2000-12-16  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gdk-pixbuf-loader.h, gtk/gdk-pixbuf-loader.c: 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index bf4830e10ce0a76e3fc24e8355b7c470cde7904f..8ffb50429c939cd5f79db5931392f3c44f609355 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+2000-12-18  Havoc Pennington  <hp@redhat.com>
+
+       * gdk/gdkevents.c (gdk_event_get_state): wow, that implementation
+       was pretty non-working.
+
+       * gtk/testtext.c (fill_file_buffer): make this a bit more robust
+       by passing the length to g_utf8_validate().
+
 2000-12-16  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gdk-pixbuf-loader.h, gtk/gdk-pixbuf-loader.c: 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index bf4830e10ce0a76e3fc24e8355b7c470cde7904f..8ffb50429c939cd5f79db5931392f3c44f609355 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+2000-12-18  Havoc Pennington  <hp@redhat.com>
+
+       * gdk/gdkevents.c (gdk_event_get_state): wow, that implementation
+       was pretty non-working.
+
+       * gtk/testtext.c (fill_file_buffer): make this a bit more robust
+       by passing the length to g_utf8_validate().
+
 2000-12-16  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gdk-pixbuf-loader.h, gtk/gdk-pixbuf-loader.c: 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index bf4830e10ce0a76e3fc24e8355b7c470cde7904f..8ffb50429c939cd5f79db5931392f3c44f609355 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2000-12-18  Havoc Pennington  <hp@redhat.com>
+
+       * gdk/gdkevents.c (gdk_event_get_state): wow, that implementation
+       was pretty non-working.
+
+       * gtk/testtext.c (fill_file_buffer): make this a bit more robust
+       by passing the length to g_utf8_validate().
+
 2000-12-16  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gdk-pixbuf-loader.h, gtk/gdk-pixbuf-loader.c: 

diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index 7823dbee350ffb1f4235c235863bbc01397e6546..8308bbeccdc5d58883057d7c07ea224b83bb39ba 100644 (file)
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@@ -397,18 +397,15 @@ gdk_event_free (GdkEvent *event)
   g_mem_chunk_free (event_chunk, event);
 }
 
-/*
- *--------------------------------------------------------------
+/**
  * gdk_event_get_time:
- *    Get the timestamp from an event.
- *   arguments:
- *     event:
- *   results:
- *    The event's time stamp, if it has one, otherwise
- *    GDK_CURRENT_TIME.
- *--------------------------------------------------------------
- */
-
+ * @event: a #GdkEvent
+ * 
+ * Returns the time stamp from @event, if there is one; otherwise
+ * returns #GDK_CURRENT_TIME. If @event is %NULL, returns #GDK_CURRENT_TIME.
+ * 
+ * Return value: time stamp field from @event
+ **/
 guint32
 gdk_event_get_time (GdkEvent *event)
 {
@@ -471,7 +468,8 @@ gdk_event_get_time (GdkEvent *event)
  * 
  * If the event contains a "state" field, puts that field in @state. Otherwise
  * stores an empty state (0). Returns %TRUE if there was a state field
- * in the event.
+ * in the event. @event may be %NULL, in which case it's treated
+ * as if the event had no state field.
  * 
  * Return value: %TRUE if there was a state field in the event 
  **/
@@ -479,28 +477,37 @@ gboolean
 gdk_event_get_state (GdkEvent        *event,
                      GdkModifierType *state)
 {
+  g_return_val_if_fail (state != NULL, FALSE);
+  
   if (event)
     switch (event->type)
       {
       case GDK_MOTION_NOTIFY:
-       return event->motion.state;
+       *state = event->motion.state;
+        return TRUE;
       case GDK_BUTTON_PRESS:
       case GDK_2BUTTON_PRESS:
       case GDK_3BUTTON_PRESS:
       case GDK_BUTTON_RELEASE:
-        return event->button.state;
+        *state =  event->button.state;
+        return TRUE;
       case GDK_SCROLL:
-       return event->scroll.state;
+       *state =  event->scroll.state;
+        return TRUE;
       case GDK_KEY_PRESS:
       case GDK_KEY_RELEASE:
-       return event->key.state;
+       *state =  event->key.state;
+        return TRUE;
       case GDK_ENTER_NOTIFY:
       case GDK_LEAVE_NOTIFY:
-       return event->crossing.state;
+       *state =  event->crossing.state;
+        return TRUE;
       case GDK_PROPERTY_NOTIFY:
-       return event->property.state;
+       *state =  event->property.state;
+        return TRUE;
       case GDK_VISIBILITY_NOTIFY:
-        return event->visibility.state;
+        *state =  event->visibility.state;
+        return TRUE;
       case GDK_CLIENT_EVENT:
       case GDK_NO_EXPOSE:
       case GDK_CONFIGURE:
@@ -526,7 +533,8 @@ gdk_event_get_state (GdkEvent        *event,
         break;
       }
 
-  return 0;
+  *state = 0;
+  return FALSE;
 }
 
 /**

diff --git a/gtk/testtext.c b/gtk/testtext.c
index 4cdfbb3f75cf3852307381d2ffed4f551a30d62b..54b94a59d5983acced7be039899dbccdb8062363 100644 (file)
--- a/gtk/testtext.c
+++ b/gtk/testtext.c
@@ -643,7 +643,7 @@ fill_file_buffer (GtkTextBuffer *buffer, const char *filename)
       count = fread (buf + remaining, 1, to_read, f);
       buf[count + remaining] = '\0';
 
-      g_utf8_validate (buf, -1, &leftover);
+      g_utf8_validate (buf, count + remaining, &leftover);
       
       g_assert (g_utf8_validate (buf, leftover - buf, NULL));
       gtk_text_buffer_insert (buffer, &iter, buf, leftover - buf);

diff --git a/tests/testtext.c b/tests/testtext.c
index 4cdfbb3f75cf3852307381d2ffed4f551a30d62b..54b94a59d5983acced7be039899dbccdb8062363 100644 (file)
--- a/tests/testtext.c
+++ b/tests/testtext.c
@@ -643,7 +643,7 @@ fill_file_buffer (GtkTextBuffer *buffer, const char *filename)
       count = fread (buf + remaining, 1, to_read, f);
       buf[count + remaining] = '\0';
 
-      g_utf8_validate (buf, -1, &leftover);
+      g_utf8_validate (buf, count + remaining, &leftover);
       
       g_assert (g_utf8_validate (buf, leftover - buf, NULL));
       gtk_text_buffer_insert (buffer, &iter, buf, leftover - buf);